fighting resolved